Merge branch 'patch-1' into 'stable-3.1'

Till Brehm

2016-04-27 65dc1a19e784f20f4b275c0fdc519d27a4a9b08e

1
2
3
4
 
Please see issue tracker for feature requests and bug reports.
 
http://git.ispconfig.org/ispconfig/ispconfig3/issues