#14 - Backport enhancements from version 1.3.1 to Elasticsearch 0.90.5