Merge branch 'master' into rfc1143