[ngIRCd-GIT-ML] Alexander Barton : Merge branch 'bug153-ServerMask' into master