Cleanup whitespace.
Merge pull request #10020 from jbrown/qp_whitespace

Cleanup whitespace.