[musicdb] fix incorrect use of ComputeCRC, causing playcounts to not update. Thanks to amet
Merge pull request #4590 from tamland/nav-sound-fix

Fix: navigation sounds from user config directory are never loaded
Merge pull request #4598 from jmarshallnz/plugins_run_as_plugins

[plugins] ensure we lookup the add-on as a plugin before trying any other extension point
Merge pull request #4576 from koying/fixamcart

FIX: [mediacodec] ART is not happy with non-existent values in map
Merge pull request #4587 from fritsch/xbmc-upstream

AlarmClock: Show correct string for shutdown timer
Merge pull request #4589 from FernetMenta/aefixes

ActiveAE: fix idling of engine due to high number of samples in sink buf...
Merge pull request #4593 from FernetMenta/dxva

dxva-hd: fix past/future frames and a/v sync
Merge pull request #4581 from FernetMenta/epg

pvr: fix duplicate EPG IDs if EPG is not stored in database
Merge pull request #4583 from fritsch/xbmc-upstream

ffmpeg: Backport c94305ae23318c8956a30485cd5642829f4f16a9 to fix #15085
Merge pull request #4580 from jmarshallnz/anim_length_fix

[guilib] animation length was calculated incorrectly from effects
Merge pull request #4579 from jmarshallnz/display_path_to_delete

when deleting files, make sure we display the path
Merge pull request #4572 from arnova/rar_subs

fixed: Downloading subs for rars was broken
Merge pull request #4591 from amet/subs_fixes

Subs search fixes
Merge pull request #4575 from koying/fixdroidcolor

FIX: [droid] missing color in labels
Revert "[osxsink] - fix bad access when device announces more then 8 channels - fixes #15065"

This reverts commit b7509ea8dc3c003825b33719cbc2445093b1145f.
Revert "[ios] - remove the audiosession handling from the sink - its handled in the UIApplication already"

This reverts commit 69db028a62c700f957f6afd16ea0081124b8380f.
Partially revert changes to AESinkDARWINIOS.* from "AESink: Revisit volume part 2"
Revert "[osxsink] - for devices which report samplerate 0hz - allow user override with 44.1khz and 48khz" (pull request #4467)

This reverts commit e2cff35c794a7b7a6be6d22eb56ca8c45eda5665.
Revert "[darwinsink] - increase the initial startup timeout of the sinks to 4500ms and log error case" (pull request #4471)

This reverts commit 714e7f2c0d81371c02945ef80549a65f289fe4b7.
Revert "[osxsink] - always fetch the defaultdevice from osx instead of or (maybe"

This reverts commit 753e70826c7d28ab827843afcd96aa6dc31ff0d8.