Merge branch 'develop' into 'develop'

# Conflicts:
#   install/dist/tpl/gentoo/apache_ispconfig.vhost.master
1 job for !1664 with develop in 8 minutes and 9 seconds (queued for 12 seconds)
latest merge request