Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@2cb9ffa5cb
This commit is contained in:
Khalah Jones-Golden 2015-08-06 09:59:39 -04:00
commit f8973c8a3d

Diff Content Not Available