Merged r3518:r3700 from branch to trunk. Branch to be deleted, soon. Development continues in trunk.
--no commit message