Update to latest master

Change-Id: Ia9ef87d4a3412681acae06905ec714f644a709f4