Update to latest codebase from testing repo.
Fix for weirdness with column widths.