Merge pull request #844 from scottmcarthur/master