Be more strict about special characters in database names
Merge remote-tracking branch 'origin/master' into deploy