Update to latest master

Change-Id: Iffd5ed624eb1357b1b33f51c450d41a3b4663d3c