Update to latest master

Change-Id: I9e8662bd3b98db38de4ea10077830d7f8b0049f0