Merge branch 'master' into sofia/async-http-h1