Merge pull request #5783 from annando/issue-5768