Merge branch 'master' into csrf-on-login-and-logout

Conflicts:
	core/templates/login.php

diff --cc core/templates/login.php
index a7e93a499b5cfb34c71b66b1810940dc9b286475,669d20b32e415fc16bfc613bc618a6189f172cde..0f25f853b029517b633d7126285bfc9ab19ea811
--- 1/core/templates/login.php
--- 2/core/templates/login.php
+++ b/core/templates/login.php
@@@ -53,8 -51,7 +53,8 @@@
                <label for="remember_login"><?php p($l->t('remember')); ?></label>
                <?php endif; ?>
                <input type="hidden" name="timezone-offset" id="timezone-offset"/>
-               <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
 +              <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+               <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
        </fieldset>
  </form>
  <?php if (!empty($_['alt_login'])) { ?>

diff --cc lib/base.php
Simple merge

diff --cc lib/private/user.php
Simple merge