merged with tools branch to get bugfixes
Authored by: heiko 2013-06-04
Parent: [r1321]
Child: [r1323]