Merge branch 'parser-httpd'