More checks for duplicate names in char creation
Merge remote-tracking branch 'upstream/master'