Merge pull request #3167 from MikePetullo/lighttpd