Merge pull request #1895 from jow-/master