Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-26 6028e4692d172b63f8af79c4460f9dbff5a9a01c

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