Merge pull request #2020 from akruphi/master