Update to latest master tools