Do not wrap cookie_login in a transaction
Merge branch 'master' into beta