Merge pull request #1868 from akruphi/master