Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-25 7198764e180cf0af9f619a9079beeb12c286cf4a

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