Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/keymap.xml
	lib/python/Components/About.py
	lib/python/Plugins/Extensions/MediaPlayer/plugin.py
	lib/python/Screens/EpgSelection.py
	lib/python/Screens/InfoBarGenerics.py
	lib/python/Screens/Makefile.am (reverse-merged from commit 433025d79bd5b85fed15f8d4325823c6440697a5)