Merge pull request #2055 from akruphi/master