big merge from openatv/enigma2 01.12.2013