Merge with 1.x.
Minor whitespace fixes.