Merge pull request #6433 from annando/issue-6282