buildtools update
Merge commit 'refs/top-bases/t/3rdTools/regex' into t/3rdTools/regex