Merge pull request #2477 from dmitryunruh/master