[locale] OSX is built with 'generic' support for stdc++ locale(). Fixes issues with unicode characters not uppercasing (e.g. the 'Videos' label in French on Confluence home screen).
epg: cosmetics for fa84b0e
pvr: new advanced setting that allows to turn of channel icon auto scan during internal channel groups loading
Revert "fixed: path substitution didn't work properly for special paths. The key in m_pathSubstitutions was translated but the compared strPath not."

This reverts commit 7a5f64c3266a0aa21429df70f122f6f05c0134b2.
fixed: path substitution didn't work properly because we compared paths with slash at the end and paths without which didn't match. As we're comparing substrings here we can't use CompareWithoutSlashAtEnd().
jsonrpc: fix empty properties in Player.GetItem when playing a non-library item through Player.Open (fixes #13344)
[WIN32] fixed: lame_enc.dll couldn't be loaded due to missing symbols. added some exports and removed id3tag_set_textinfo_utf16 because its not available in our internal liblame. I ifdefed it for windows but since it seems not to be used in XBMC it could be removed entirely.
[addons] change current version number to x.y.z and add abi backwards fallback to x.y to prevent broken addons
Merge pull request #1907 from MartijnKaijser/dependency_versioning

[addons] change current xbmc.foo version number to x.y.z 
teletext: fixes #13515 transparent background issue on Windows systems
This regression was introduced in commit 424a4d98877a1da4f7d33e006504c2830225fb71: the removal of SDL for Windows.
This removed the HAS_SDL define and it turns out that the replacement SDL_memset4 define behaves different than the one from the SDL_stdinc.h header
This change implements the SDL_memset4 replacement to match the SDL original.
[paplayer] - when player is paused - don't process streams but just yield cpu to other threads
Merge pull request #1906 from margro/fixtrac13515

teletext: fixes #13515 transparent background issue on Windows systems
[WIN32] fixed: resolved special paths used with RunScript were not converted to system encoding, fixes #13651
[AE] fixed crashed on exit and next playlist item. closes #13717
disabled lastfm radio for now as last.fm pulled the plug on the api used, code will be removed completely at a later stage.
removed lastfm source option.
removed lastfm radio scrobble option.
fixed: line endings
Fix ActivateWindowAndFocus window history behaviour

ActivateWindow does add the window to the history stack, as opposed to
ReplaceWindow. Due to a copy-paste error ActivateWindowAndFocus works
incorrectly as it replaces the window, not adding it to the window
history stack as suggested by the name.
[CA/AE] fixed crashed on exit and next playlist item by making critical parts of the engine threadsafe. - signed off by memphiz & huceke
[keymap] fix broken linux support for the XBOX360 controller and add additional altnames/aliases for compatible hardware.

The default windows keymap for the 360 controller doesn't work well on linux because the linux drivers use different button IDs. We fix it by adding separate keymap sections for the linux device names with corrected button IDs. Also some new altnames/aliases for compatible hardware got added (like some Logitech gamepads)
[ios] - minimize is a senseless option for the shutdowntimer on ios - remove that option for ios - fixes #13718