Merge branch 'master' into http_parser