Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/python/Plugins/SystemPlugins/Makefile.am
Merge branch 'master' of github.com:henrylicious/enigma2