Merge master into next

Change-Id: I29dd15a860771928a19c7e2b7901ea2411c3a859