Backport PHPUnit fix to 5.1#15

moufmouf merged 2 commits into5.1thecodingmachine/html.template.bootstrap:5.1from

4.1thecodingmachine/html.template.bootstrap:4.1Copy head branch name to clipboard