US5976 remove abnormal chars
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975