Fix incorrect preg_quote usage.
Merge remote-tracking branch 'ou/master'

Conflicts:
	simpletest/testwalkthrough.php