Merged revisions 8bd0465...5d3510e, c877295ffe7f0ee0d81ba381847ae1b2a9401881, 3df31df8f26fbd54e2759312ade386599b86517e...4df988f via svnmerge from