Fix merge with upstream

src/User/Module.php

@@ -65,6 +65,10 @@ class Module extends BaseModule
      * @see http://2fa-library.readthedocs.io/en/latest/
      */
     public $twoFactorAuthenticationCycles = 1;
+    /**
+     * @var bool whether to allow auto login or not
+     */
+    public $enableAutoLogin = true;
     /**
      * @var bool whether to allow registration process or not
      */
@@ -93,6 +97,10 @@ class Module extends BaseModule
      * @var bool whether to enable password recovery or not
      */
     public $allowPasswordRecovery = true;
+    /**
+     * @var bool whether to enable password recovery from the admin console
+     */
+    public $allowAdminPasswordRecovery = true;
     /**
      * @var bool whether user can remove his account
      */
@@ -161,4 +169,8 @@ class Module extends BaseModule
      * @var string the session key name to impersonate users. Please, modify it for security reasons!
      */
     public $switchIdentitySessionKey = 'yuik_usuario';
+    /**
+     * @var integer If != NULL sets a max password age in days
+     */
+    public $maxPasswordAge = null;
 }