Merge pull request #2438 from Rixerx/master