Merge pull request #1896 from akruphi/master