Merge branch 'master' of git://git.pk910.de/IOMultiplexer into IOMultiplexer