Merge pull request #7225 from kennell/master