(Merged by Marcus Meissner <marcus@jet.franken.de>)