Merge branch 'hotfix/v1.1.6' into development
Merge branch 'haproxy_multiple_onfigurations_per_host' into development