Update devtools
Merge branch 'devtools' of github.com:mbj/veritas into devtools