Merge pull request #1797 from Rixerx/master