Merge "Tests for an already-fixed CharsetEncoder bug." into klp-dev