Merge pull request #9157 from tobiasd/20200907-9155lighttpd