Merge pull request #719 from annando/issue-4475