Merge pull request #1949 from Rixerx/master