Tahi-project/tahi — pull request #661 by faun (2014-11-27 00:13:10+00:00)
Title: Restore lost changes

Due to some unspeakable git munging, we lost some changes from the original docx_conversion. This is an approximation of those lost changes.