Merge pull request #1942 from Rixerx/master