merged with tools branch to new comment type
Authored by: heiko 2013-06-05
Parent: [r1330]
Child: [r1332]