Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-03 03d03093c9ca77befa029931e089f8abac96d3bb

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