Merge branch 'fix-doc' of git://git.norang.ca/org-mode