[O] Backports from Emacs repo

[Kyle Meyer]

Hello,

I've backported changes touching Org files in the main Emacs repo
(lisp/org/*.el, doc/misc/org.texi, and etc/refcards/orgcard.tex) since
the last Org mode sync with Emacs.  These changes are in the temporary
branch 'backport-master'.  I'll wait to perform the actual merge to
master until after Nicolas returns.  In the meantime, feel free to let
me know if you have any comments or issues with the backports or with
how the conflicts are resolved.

--
Kyle