Re-add two paragraphs that seem to have been lost during the merge from trunk.