merging webserver.tex with upstream