minor spelling/formatting fix for previous unicode commit
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'