Merge pull request #1769 from jow-/master