Merge pull request #5759 from annando/issue-5733