Merging appropriate 2.1.1 fixes back into the main trunk.
26 files changed