Merge branch 'develop'
Merge branch 'develop'
holoirc: fix adding server when autojoin channels are also added
Merge branch 'release-3.0.1' into develop