Merge pull request #785 from annando/issue-5911