Updated master branch for web server proxy
Merge branch 'master' into composite