Merge pull request #3982 from jmarshallnz/wav_tags

Support WAV/AIF tags via taglib
Merge pull request #4079 from t-nelson/speed_up_repo_update_abort

Pivos: Speed up aborting addon repo update job.
Merge pull request #4119 from Montellese/peripherals_notifications

peripherals: don't show notifications for new devices during the initial scan
Merge pull request #3888 from vkosh/epg-grid

[pvr] show gaps on epg timeline grid
AESinkPULSE: Don't leak pa_format_info
drop support for external ffmpeg
linux: link ffmpeg statically
Merge pull request #4005 from FernetMenta/ffmpeg

linux: link ffmpeg statically
Merge pull request #4118 from FernetMenta/aefixes

ActiveAE: AEStream::AddData returned wrong number in some cases
Merge pull request #4120 from jmarshallnz/no_subs_service_is_fine

The default subs service for tvshows/movies is allowed to be empty
[activeae] check whether the sink has a device for passthrough when loading settings
[activeae] fix compile warnings
[activeae] set the number of input frames to the number of sink frames during raw (passthrough)
move preferred subtitle selection from appearance to subtitle section and put setting in a more logical order
[cosmetic] improve subtitle setting text
Merge pull request #4129 from MartijnKaijser/settings_subtitles

shuffle subtitle settings
[fix] resume playback on Bluray
[fix] [omxplayer] resume playback on Bluray
Merge pull request #4123 from fritsch/pa-sink-layout

AESinkPULSE: Don't leak pa_format_info
Merge pull request #4131 from Voyager1/fix-bluray-resume

[fix] Resume playback on Bluray