Merge of branch Temp_KnuthStylePageBreaking back into HEAD. Temp_KnuthStylePageBreaking branch and HEAD have been tagged prior to the merge, so merging uncommitted work from the branch should be easier.