Refs #841: Branch merged back into the trunk.

git-svn-id: https://svn.cern.ch/reps/cactus/trunk/cactuscore/swatch@32228 4525493e-7705-40b1-a816-d608a930855b