Merge of https://github.com/openatv/enigma2