Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-06-17 522bede75fce4a0e3a7d2c7eff1eee198b900a22

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