merge remote from https://github.com/openatv/enigma2/commits/master