Merge pull request #1824 from krauseo/master