Merge branch 'master' into merge

Change-Id: Id77bb2de77dd288404c83e331b076aaf9aafacc5