Fixed merge issue
Cleaned up the encoding a little more
Merge remote-tracking branch 'origin/master' into rangstoreRework