Merge remote-tracking branch 'origin/master' into rfc1.1

Change-Id: I8ec310ba048683560dd39e46a28f8c0a231a2fe8