Merge in znc changes!