Merge pull request #983 from Shulyaka/master