Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@abe129b09c
This commit is contained in:
Khalah Jones-Golden 2015-08-24 15:05:19 -04:00
commit 76abcea205

Diff Content Not Available