Merge remote-tracking branch 'private/master' into secure-easy-use-negotiation

Author: gudeh