More robust regexp
More robust regexp
Merge branch 'quickpay-v6'