merge remote fix from openatv/enigma2