Merge remote-tracking branch 'georgjaehnig/spiegeltv'