Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-31 dbf57dddf7ef07a0168ad0c1d64de0735a9c5804

 server/conf/mail/db_quota_notification_en.txt

@@ -1,4 +1,4 @@
ME-Version: 1.0
MIME-Version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: {admin_mail}