Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@c198f64c57
This commit is contained in:
Khalah Jones-Golden 2015-08-20 18:21:13 -04:00
commit f8f0fc0c54

Diff Content Not Available