Merge branch 'master' into hotfix
localized string for HA setting added.
Merge branch 'hotfix'