1.2 branch needs merging

[Andreas Pakulat]

Hi,

seems like nobody merged 1.2 into master since almost 2 weeks, this is bad
because there have been build-fixes to 1.2 in that timespan and master
currently fails to build for a couple of people. I would've done it but I
can't build master here and there have been conflicts I don't have a clue
about.

Andreas

-- 
Today's weirdness is tomorrow's reason why.
		-- Hunter S. Thompson