Merge pull request #2422 from Shulyaka/master