Brought docx2pandoc in sync with development pandoc.