Merge pull request #5614 from alexrp/master