Merge pull request #7044 from wolever:master