51be352 Merge pull request #1315 from sergeyk/master