Fix regex
Merge branch 'master' into list-fixes