Update to latest master

Change-Id: I0f8e68b8023fc60f9751c0c4f9840202c93a7d5f