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

Till Brehm

2016-06-28 225c7a38631d06798f7e98dc250a98cdd1bbf7f4

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