Merge pull request #4735 from cg110/fix_web_server_mem_leak