Merge pull request #4896 from jcadduono/minidlna-sorting