Merge pull request elastic/elasticsearch#471 from panda01/master

A whole bunch of uddates and such

Original commit: elastic/x-pack-elasticsearch@02751b9b78
This commit is contained in:
Chris Cowan 2015-08-20 10:13:53 -07:00
commit 8b90d91395

Diff Content Not Available