Update to latest master

Change-Id: Ieb94a7269ce20603903f405c9e54e9b751a312e1