Merge pull request #4760 from ejurgensen/forked-daapd_builderr3