Merge branch '207_minor_regex_fixes' into mc-4.6