[svn-upgrade] Integrating new upstream version, teleschorsch (0.0.6)