merge from upstream master
Add support for 2dsphere and geohaystack index types