Merge pull request #1446 from odinserj/master