#15 - Backport enhancements from version 1.3.2 to Elasticsearch 0.90.5
to make version 1.2.4