Upstream emacs-chess changes
Upstream org changes