Merge pull request #2279 from antonlacon/minidlna-1.1.x