[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 "[osx] drop outputbuffer index and iterate over them all"

This reverts commit b9a1d07a7d1a2bec3bb094b97cc7d96a325b9b98.

Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
[darwinsink] - use fixed outputbuffer with idx 0