Bump to latest master & update dependencies

Change-Id: Ifb32288cf6ce2fdb0d80126a13591799fc933616