Merge pull request #3839 from thess/icecast-update