Minor fix
Merge branch 'master' into http_plugin