Fixed nick changes
Merge branch 'master' into xep-0223