Merge pull request #1982 from Rixerx/master