Merge pull request #5317 from alexrp/master