Merge branch 'master' into whx

Change-Id: Ic272087eaf74f7219c49d07a475458240f28be3d