Merge git://repo.or.cz/pyTivo/krkeegan into subfolders-8.3