merge remote from https://github.com/openatv/enigma2/commits/master (reverted from commit 59d8078631b6b39895e4aa3499f2938aadb1e706)
merge remote from local git (reverted from commit 7ebfb4e7a7da1f813a5e5fe85be438e5204a7f59)