Merge pull request #2856 from manio/master