Update tools to latest version from master