merge from openatv
https://github.com/openatv/enigma2/commit/fdcdd049c9ac27a92bd961103497c3da25ce9572