Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06