Fix versioner regexp's (fixes #1023)