Merge commit 'origin/testing' into 0.9.x

Conflicts:
	lib/action.php
	lib/adminpanelaction.php

1 files changed, 1 insertions, 1 deletions

diff --git a/index.php b/index.php
index 215d1f676..65f251bcc 100644
--- a/index.php
+++ b/index.php
@@ -200,7 +200,7 @@ function checkMirror($action_obj, $args)
 
 function isLoginAction($action)
 {
-    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds');
+    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp');
 
     $login = null;