Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@f425121ad8
This commit is contained in:
Khalah Jones-Golden 2015-07-23 17:31:43 -04:00
commit 565b97ab6f

Diff Content Not Available