This should address inaturalist/inaturalist#333
Merge pull request #337 from pleary/master

This should address inaturalist/inaturalist#333