Merge pull request #1630 from akruphi/master