Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-09 9e63ffc814b8087ea8c1ba7c819bc91ff9ee985a

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