Merge branch '3.x' into 4.x

Author: daftspunk

src/Auth/Models/User.php

@@ -320,6 +320,11 @@ public function attemptResetPassword($resetCode, $newPassword)
         if ($this->checkResetPasswordCode($resetCode)) {
             $this->password = $newPassword;
             $this->reset_password_code = null;
+
+            if ($this->is_password_expired) {
+                $this->is_password_expired = false;
+            }
+
             return $this->forceSave();
         }