Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-06-03 bd4c2e96fd4566bfcd8042f82ccac090419734a3

 interface/web/mail/mail_user_edit.php

@@ -209,7 +209,7 @@

      // Set Maildir format
      if ($this->id == 0) {
         $this->dataRecord['maildir_format'] = $sys_config['maildir_format'];
         $this->dataRecord['maildir_format'] = $mail_config['maildir_format'];
      }
      else {
         // restore Maildir format