* merged with tools branch to get fix for bug #86
Authored by: heiko 2013-06-05
Parent: [r1332]
Child: [r1334]