Merge pull request #364 from klynton/master

Actually push the change to the upstream repo.