Merge pull request #535 from annando/issue-1312