[ngIRCd-ML] branch-0-6-0: Backports from HEAD