Merge pull request #849 from annando/false-positive