Update to latest master

Change-Id: I7376d2302a4e71bc112788115d93b6ba1c6800a6