[Truffle] Minor tweaks to run red-black.
Merge branch 'master' into truffle-head