Merge remote-tracking branch 'upstream/master'
Confluence: fix default EPG background color for PVR addons that only use genre strings
(GenreType = 0x100)
fixed: SFTP stat didn't set directory/file type causing eg. libdvd to fail on ISOs
factor out the UI scaling computation from SetScalingResolution
use GetGUIScaling rather than SetScalingResolution when computing font size so as to not alter stored state
[pvr] bump add-ons (missing stubs in nextpvr)
[win32] fix project file after 3bc2dfd8442ea5109154f98fa0063660cd8fced2
[fix] adds missing m_bIsRadio property to operators in CPVRTimerInfoTag
addongui: fix incorrect version in header
CAddonsDirectory::FileItemFromAddon should take a const AddonPtr &
replace xbmc.python.subtitles extension with xbmc.subtitle.module one
[subtitles] adds new dialog for subtitles to core.
[confluence] changes for new subtitles dialog
[subtitles] set a maximum of 3 languages.
Merge pull request #3552 from jmarshallnz/SubsCore

Move subtitle addon core handling to core.
[Fix][Util] Fix format of external subtitles' name (including empty name).
[xcode] - i call this a "xcode nothing" change - but xcode insists on a different order of those files ...
Input: Scan for joysticks that are keyboards to workaround kernel bug, see: 1560550480302e4768d1e183f038b709dd5a52fd
[gtest] - move test for texturecache to textureutils as the tested method also moved classes... fixes compile of testsuite
[TestTextureUtils] - cleaned up the test by utilising some smart gtest macros - taken from superseeded PR of smspillaz - thx