Merge branch 'master' into calendar_repeat

diff --cc apps/calendar/ajax/events.php
index ccf6102ab460e7460e871c2837f8fe0a1c21bcd1,39130a6a983f2ec3db0127dc559410f8ac0fc71b..6ea89e3e5b3c78e18c331c1d8ea0241400776168
--- 1/apps/calendar/ajax/events.php
--- 2/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@@ -5,8 -5,13 +5,9 @@@
   * later.
   * See the COPYING-README file.
   */
 -
 - 
 -require_once('when/When.php');
 -
  OCP\JSON::checkLoggedIn();
  OCP\JSON::checkAppEnabled('calendar');
+ session_write_close();
  
  // Look for the calendar id
  $calendar_id = null;