Merge pull request #1127 from oleg-st/master