Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6