Merge pull request #4256 from mwichmann/maint/regexps