Update to Elasticsearch 1.3.4
Merge branch 'master' into stable-1.3