Update to latest master

Change-Id: Ia167171454a3dfc746750ee383d152199726d0fa