Merge pull request #5640 from alexrp/master