Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@ed611e3637
This commit is contained in:
Khalah Jones-Golden 2015-07-27 10:12:31 -04:00
commit d9939dbe64

Diff Content Not Available