Fix spacing from df99fb8.
Cleanup bootstraps.
Missing from edaf1e0.
Merge branch '4.4' into 4.5
Merge branch '4.5'