Merge branch 'refs/heads/minitest_escape_regex_interpolation' into merged-fixes

* refs/heads/minitest_escape_regex_interpolation:
  fix minitest: escape regex interpolation

Conflicts:
	files/default/tests/minitest/default_test.rb