Merged $database and $dbname. That could have been nasty in a release