Regex performance fix
Merge pull request #43 from xandros6/testfix_migration

Regex performance fix