fixed: Nginx filesize was broken for some configs (+tweak regex a bit)
Merge pull request #4555 from FernetMenta/musicosd

fix flickering music OSD
Merge pull request #4491 from ruuk/ignorecache

Added optional parameter 'ignoreCache' to xbmc.playSFX()
FIX: [droid] allow all boxes to enable passthrough (frodo way)
changed: Don't try to sort subtitles, it screws up eg. sync priority
Merge pull request #4560 from arnova/sub_nosort

changed: Don't try to sort subtitles, it screws up eg. sync priority
Merge pull request #4551 from Montellese/settings_language_fix

fix crash when changing language from non-GUI thread (fixes #15113)
flac demuxer: improve seeking
ffmpeg: backport flac seeking patch
ActiveAE: check suspend state before creating a stream
FIX: [keyboard;droid] add mappable media keys for rewind and fastforward
[epg] cleanup: refactor/remove methods MoveChannel and MoveProgrammes
[epg] cosmetics: refactor, code formatting etc.
[epg] cleanup: remove unnecessary method CorrectOffset()
[epg] cosmetics: code formatting
[epg] cleanup: remove friend class declaration PVR::CGUIWindowPVRGuide
Merge pull request #4563 from FernetMenta/aefixes

ActiveAE: check suspend state before creating a stream
Merge pull request #4562 from FernetMenta/flac

ffmpeg backport: improve seeking in flac files
Merge pull request #4559 from koying/fixdroidpassthrough

FIX: [droid] allow all boxes to enable passthrough (frodo way)
Merge pull request #4553 from stefansaraev/upnp-settings

[settings]: fix upnp category visibility when built with --disable-upnp