Merge pull request #5610 from alexrp/master