Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

1
2
3
4
From: ISPConfig <postmaster@localhost.localdomain>
Subject: Welcome to your new email account.
 
Welcome to your new email account. Your webmaster.