1.9 to 1.x, up until right before the whitespace changes

partial update of 1.9 to 1.x. Going to try to run the whitespace script in 1.x before merging up.