[videodb] fix crash linking a movie to a show if there's no tvshows left to link.
[videodb] show select dialog for linking a movie to a show, even if there's only one show to link to.
Merge pull request #4479 from mossywell/master

Change FLAC MIME type
Merge pull request #4487 from Montellese/settings_defaults

settings: remember whether a setting has its default value or not
Merge pull request #4484 from jmarshallnz/curl_ssl_fix

[openssl] backport fix to alert handling from openssl 0.9.8za to fix github repos
Merge pull request #4486 from Montellese/jsonrpc_screensaver_notifications

jsonrpc: add missing GUI.OnScreensaverActivated/OnScreensaverDeactivated notifications to the API definition
Merge pull request #4463 from jmarshallnz/osx_vsync_always

[osx] vsync should default to always
Merge pull request #4493 from Memphiz/airplaypicvolume

[airplay] - fix unwanted volume restore
Merge pull request #4488 from FernetMenta/paplayer

paplayer: use position based seeks for ffmpeg demuxer
Merge pull request #4495 from FernetMenta/aefixes

WASAPI: add 192khz sample rate in case we added HD formats
Merge pull request #4498 from popcornmix/reschange

[settings] Only need a confirmation dialogue when resolution has changed
[webui] Profiles tab is not deselected
Merge pull request #4501 from sagiben/Gotham

Profiles tab is not deselected
Merge pull request #4500 from FernetMenta/aefixes

Revert "paplayer: use position based seeks for ffmpeg demuxer"
Merge pull request #4494 from davidbanham/master

Add keyboard controls to web remote
Merge pull request #4508 from Montellese/settinglist_default_fix

settings: fix detection of value changes in CSettingList
Merge pull request #4504 from FernetMenta/paplayer

paplayer: rewind stream after init (ffmpeg codec)
Merge pull request #4502 from fritsch/pa-revisit-volume2

AESink: Revisit volume part 2
Merge pull request #4510 from FernetMenta/aefixes

ActiveAE: verify resample context before using it
Merge pull request #4489 from Orochimarufan/sslcipher

Make the allowed SSL Ciphers a protocol option for CurlFile.