Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@f7d4238cc7
This commit is contained in:
Khalah Jones-Golden 2015-08-19 19:44:49 -04:00
commit 01e88961f4

Diff Content Not Available