Add ServeHTTP
Merge branch 'default-server' into 1.1-development

* default-server:
  Add ServeHTTP