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

Till Brehm

2016-06-28 d44c3fa38bb0e29718ad7d4009342faf9d2a32a7

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