[minidlna/el7] (23 commits) ...fix merge