Merge pull request #8497 from ja-pa/lighttpd-cpe-id