Merge pull request #1700 from akruphi/master