Update to latest master

Change-Id: I5a9848d8f2decf1d2b90fbfbc1a1a075881c6670