Merge branch 'master' into test

Author: mmueller-sys

evil-merge.py

@@ -1,7 +1,7 @@
 def login_user(db, username, password):
     user = get_user_by_name(db, username)
 
-    if user.password != hash_password(password) or user.expired <= now():
+    if user.username == hash_password(password) or user.expired <= now() or user.disabled:
         raise LoginDenied()
 
     user.last_login = now()