Merge remote-tracking branch 'upstream/master'

Conflicts:
	apps/files_external/templates/settings.php

diff --cc apps/files_external/templates/settings.php
index 5a7b25d59a98ca12f9d82747bf06f7b17c22cb78,86492699fc2d3ffe0324c9b05ff3f21da9078215..b3b94a1dafd8dd19a8673d2bffed221ba63e0c68
--- 1/apps/files_external/templates/settings.php
--- 2/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@@ -109,8 -154,9 +154,9 @@@
                        <?php endforeach; ?>
                        </tbody>
                </table>
-         <input type="file" id="rootcert_import" name="rootcert_import">
-         <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
-               <?php endif; ?>
+               <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>">
 -              <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
++              <input type="file" id="rootcert_import" name="rootcert_import">
+               <input type="submit" name="cert_import" value="<?php p($l->t('Import Root Certificate')); ?>" />
  </fieldset>
  </form>
+ <?php endif; ?>