Tweak regex.
Merge remote branch 'upstream/master' into output.tweak-test-regex

Conflicts:
	tests/output/00-submission.t
Merge remote branch 'upstream/master' into output.tweak-test-regex
Change while loop.
Merge pull request #726 from arjclark/output.tweak-test-regex

Tweak regex.