The 1.2 branch is now merged with the tr…

The 1.2 branch is now merged with the trunk. Please test it out and report any oddities.

#merge, #trunk