Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-27 f8a07d139335a2c21a288546e6fb1922e4623127

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