Merge master into next

Change-Id: Ied91fe98570425ff86c3c80766bac2c9cb0a7463