Upgrade to Elasticsearch 1.2.1