Merge pull request #5112 from annando/issue-5111