PATCH-2/5: org-odt compatibility