Merge pull request #2009 from akruphi/master