PR/352: Support for Hangul (Korean) Word Processor 5.x Files (*.hwp)
PR/354: Encoding irregularities.
PR/354: Fix stray ^M's
Merge remote-tracking branch 'upstream/master'
merge with upstream