Merge branch 'ZNCv1' into MixedVersions