This also includes a minor change to web_service.cpp - to fix compatibility with upstream changes.
39c8d18