Only one nickname text for multiple custom names
Merge remote-tracking branch 'origin/master' into gh-pages