merged with tools branch to get color parser bugfix
Authored by: heiko 2013-06-03
Parent: [r1311]
Child: [r1313]