Elasticsearch 0.90.8~12 Compatibility
Merge branch 'es_0.90.8-' into json-customizable-and-type-selectable