Merge remote-tracking branch 'teamxbmc/Gotham' into Gotham
Merge remote-tracking branch 'teamxbmc/Gotham' into Gotham
Merge branch 'Gotham' of https://github.com/xbmc/xbmc into Gotham
Merge remote-tracking branch 'teamxbmc/Gotham' into Gotham
[release] bump version to 13.2 beta3
[addons] sync with repo
Merge pull request #5101 from FernetMenta/ffmpeg-threads

ffmpeg: fix deadlock caused by calling avctx->thread_count after codec_o...
Conflicts:
	xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
Merge pull request #5095 from koying/fixdroidappcrash

FIX: [droid] crash if an app is favourited, then uninstalled from system
Conflicts:
	xbmc/filesystem/AndroidAppDirectory.cpp
Merge pull request #5048 from wsnipex/ssl-fix

[configure] properly detect if curl was compiled statically with openssl
Merge pull request #5042 from koying/fixbitstream

FIX: Upstream Annex-B bitstream conversion fix for some BD mkv iso rips
Merge pull request #5106 from MartijnKaijser/13.2b3

[release] bump version to 13.2 beta3
Merge branch 'Gotham' of https://github.com/margro/xbmc into Gotham
Merge remote-tracking branch 'teamxbmc/Gotham' into Gotham