Merge branch 'master' of github.com:sgillies/draft-geojson
Merge branch 'master' of github.com:geojson/draft-geojson