Merge pull request #4735 from cg110/fix_web_server_mem_leak

Fix webserver memory leak
Merge pull request #4676 from jmarshallnz/dont_set_scraper_on_tvshow_on_nfo

[tvshows] don't set scraper if we find a tvshow.nfo file.
Merge pull request #4791 from jmarshallnz/playlist_settings

Playlist settings don't update on change of profile
Merge pull request #4845 from Memphiz/trac15261

[AE/osxsink] - allow up to 16 channels in osx sink - fixes #15261
Merge pull request #4826 from robwebset/master

Update hooks for TvTunes
Merge pull request #4852 from FernetMenta/aefixes

ActiveAE: fix reset of buffering after 51ff5b6e39a752787547dbe79f6c58206...
Merge pull request #4719 from Memphiz/osxsink_channelmap

[AE/osxsink] - fix multichannel speaker layout / channel mapping