Merge pull request #2129 from Rixerx/master