Merge master.
Merge pull request #34 from mapbox/geometry-zxy-master

master => geometry-zxy