server context handler
Merge branch 'master' into ServerContextHandler
Merge branch 'ServerContextHandler'