merged latest master from upstream.

Thank you all!