Merge pull request #2852 from alexrp/master