Merge branch 'master' into whx

Change-Id: I5c762a5c89464d0465622fbe9e1fee733097c143