Integrate all recent changes from the main stream
Integrate all recent changes from the main stream

GerHobbelt/civet-webserver,commshare/civet-webserver,commshare/civet-webserver,commshare/civet-webserver,GerHobbelt/civet-webserver,GerHobbelt/civet-webserver,commshare/civet-webserver,commshare/civet-webserver,commshare/civet-webserver,commshare/civet-webserver,GerHobbelt/civet-webserver,GerHobbelt/civet-webserver,GerHobbelt/civet-webserver