better sirs regex
Merge branch 'master' into sauerbraten