Merge pull request #2928 from alexrp/master