4194d253c0
Pattern needed a non-greedy match; also replaced a redundant test with one for this, issue 29690
Pattern needed a non-greedy match; also replaced a redundant test with one for this, issue 29690