Merge pull request #1795 from MikePetullo/lighttpd