Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 server/plugins-available/mail_plugin.inc.php

@@ -247,7 +247,7 @@
         $mailHeaders     .= "Content-Type: text/html; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Transfer-Encoding: quoted-printable" . "\n";
      } else {
         $mailHeaders     .= "Content-type: text/plain; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Type: text/plain; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
      }
      $mailHeaders     .= "From: $welcome_mail_from" . "\n";