Merge pull request #4472 from annando/issue-4369