[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).
[Peripheral] Use per-device iMON setting instead of system-wide setting.
[LinuxRendererGLES] - Don't let RENDER_BYPASS clear out the whole screen (use video rect instead)
Revert "[paplayer] - when player is paused - don't process streams but just yield cpu to other threads"

This reverts commit 470cb0723bf3676cc011355af1d28d737c48565a.
[AE/CA] - fix implementation of AEStream::GetSpace. This is the real fix for the paplayer problem where the next stream was started by accident when paused for a while (visible on dvdplayercodecs). Thx to jm for hammering on it and thx to gimli for the fix :)
Merge pull request #1920 from mikrohard/bypass_windowed_fix

[LinuxRendererGLES] - Don't let RENDER_BYPASS clear out the whole screen
[droid] fix pvr addons dependencies (fixes pvr.mythtv)
pvr: new advanced setting that allows marking channel icons populdated by auto scan as "user-set".
[keymap] add more aliases to the XBOX360 controller mappings, fixing some inconsistencies and enable all triggers on linux (even if current driver version seems to have issues)
Merge pull request #1924 from da-anda/keymap-xbox360v3

[keymap] add more aliases to the XBOX360 controller mappings, fixing som...
fixed: Make sure when creating a tiled thumbnail at least one image loads properly
fixed: Ignore extension case when checking for our jpeg loader + also consider .jpeg files
Merge pull request #1925 from arnova/picture_thumb_fixes

Picture thumb fixes
[nfs] - we need to hold the lock for the keepalive list during the whole keepalive process and we have to remove a filehandle from the list before closing it (else there would be a race where the keepalive could access a already closed filehandle bammm).
[nfs] - we need to refresh the last accessed time of the used context aswell when we reset the filehandle last accessed time. There was a race with PAPlayer where track1 was still opened and the context was nearly timed out - then track2 got opened shortly before track1 was closed and requested the context which was now timed out already - so the open of track2 destroyed the context and created a new one - now track1 was read again with the already destroyed context - booom.
[pvr] Use play count and resume point information from the PVR client if available.
Merge pull request #1779 from fritsch/xbmc-upstream

AE: don't hide ALSA HDMI devices based on missing ELD data - it does not work reliably enough
jsonrpc: fix crash on empty "params" parameter in Addons.ExecuteAddon (fixes #13729)
Merge pull request #1926 from axmhari/pvr-watched-fix

[pvr] Use play count and resume point information from the PVR client if available.
[pvr] bump pvr add-ons to 1409bbaa9248646372cf5c838def8c49c90e6e11 for Frodo RC2