regex refinements
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6