Update to latest master

Change-Id: I61fc32637b2d1997097d66295a3f4fb3fe159918