Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@c983d808bb
This commit is contained in:
Khalah Jones-Golden 2015-11-09 16:31:58 -04:00
commit a8e5dee9b5

Diff Content Not Available