Merge pull request #845 from meyerrj/master