Merge pull request #3116 from alexrp/master