Merge latest stable with master
diff --git a/pkgs/test/README.md b/pkgs/test/README.md
index d7c49c0..87cf5c3 100644
--- a/pkgs/test/README.md
+++ b/pkgs/test/README.md
@@ -550,7 +550,7 @@
### Providing a custom HTML template
If you want to share the same HTML file across all tests, you can provide a
-`custom-html-template-path` configuration option to your configuration file.
+`custom_html_template_path` configuration option to your configuration file.
This file should follow the rules above, except that instead of the link tag
add exactly one `{{testScript}}` in the place where you want the template processor to insert it.
@@ -562,7 +562,7 @@
For example:
```yaml
-custom-html-template-path: html_template.html.tpl
+custom_html_template_path: html_template.html.tpl
```
```html
