Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-26 498c86fbbfc4aa034758693309dd97b7ca4ef4f0

 server/lib/classes/cron.d/900-letsencrypt.inc.php

@@ -36,8 +36,9 @@
   public function onRunJob() {
      global $app, $conf;

      if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
         exec('/root/.local/share/letsencrypt/bin/letsencrypt -n renew');
      $letsencrypt = array_shift( split("\n", `which letsencrypt /root/.local/share/letsencrypt/bin/letsencrypt`) );
      if(is_executable($letsencrypt)) {
         exec($letsencrypt . ' -n renew');
         $app->services->restartServiceDelayed('httpd', 'reload');
      }