Idiomatic regexp match
Merge pull request #7612 from holmboe/idiomatic-match

Idiomatic regexp match