TextEncoding fixes, added reverse encodings
Merge remote-tracking branch 'upstream/develop' into develop