Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	apps/files/index.php
	apps/files/templates/index.php

diff --cc apps/files/index.php
index 62e1438fc63b76546829114bfbefb91acd97878b,42eac209b23980ae096c764527a6012c2a8e6c4f..8d877be8ac981a9a2f0ffb6e4861dcf8ed6653d7
--- 1/apps/files/index.php
--- 2/apps/files/index.php
+++ b/apps/files/index.php
@@@ -133,9 -137,8 +137,10 @@@ if ($needUpgrade) 
        $tmpl->assign('isPublic', false);
        $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
        $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
 +      $tmpl->assign("mailNotificationEnabled", \OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
+       $tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
        $tmpl->assign('disableSharing', false);
        $tmpl->assign('ajaxLoad', $ajaxLoad);
 +
        $tmpl->printPage();
  }

diff --cc apps/files/templates/index.php
index e578a1f563cb1f2165ddd085a44cdc214f4e85f5,1c6cd267d8587d43ee5297c19934df12d5ea982f..7067b854f50a619dc8fb73f185658088d237228f
--- 1/apps/files/templates/index.php
--- 2/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@@ -116,4 -116,4 +116,5 @@@
  <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
  <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
  <input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
+ <input type="hidden" name="encryptedInitStatus" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" />
 +<input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" />

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