Merge pull request #11248 from ejurgensen/forked-daapd_update_271