Merged latest master from upstream

Thanks @elasticsearch !