Merge pull request #912 from Shulyaka/master