Merge pull request #1779 from tisj/master