Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm

2016-05-19 9d3f20bb3ef7391c94eae54ddf3750bcc181678e

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