Adding logic to guess at the file's character set.  BAU-123
Merge remote-tracking branch 'origin/dev-BAU-123' into release/2.9.19rc
version shuffle, shoop-de-doo