Merge remote-tracking branch 'upstream/master'

Conflicts:
	resources/language/Dutch/strings.po
	resources/language/English/strings.po
	resources/language/German/strings.po
	resources/settings.xml
Merge branch 'master' of https://github.com/Veronit/xbmc-gamepass