Merge pull request #946 from AndersHoglund/master