Upgrade to ElasticSearch 1.2.1