Merge branch 'MDL-58761_bad_regex_in_custom_step' of https://github.com/gthomas2...