Update tools to latest from master

    updated by the update script ./tools/rebase-tools.sh