Update to latest master

Change-Id: I25594a668ee2eec5a6d303f1fb39169cb0fbefd3