Merge branch 'rj/test-regex' into maint-1.7.11