Merge pull request #427 from jbrodman/master

Clang ToT fixes.