Merge pull request #2569 from castillofrancodamian/uhttpd