Fixed a regular expression
Merge branch 'dev-3.2.4' into dev-3.1.6
Merge branch 'dev-3.1.6' into dev-3.0.14