[COMMIT] Sync carbon2 with the trunk

[Aidan Kehoe]

APPROVE COMMIT

NOTE: This patch has been committed

9.8 MB patch omitted. This change doesn’t merge Andrew Choi’s latest changes
in, just moves trunk changes out to the branch. I intend to merge his work
since the creation of the Carbon2 branch next. 

-- 
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)