Update #55.
Don't forget to upgrade your ElasticSearch servers to an 1.1.x version.
Merge branch 'master' into dvl