Merge pull request #3117 from alexrp/master