Upstream org changes
Upstream emacs-chess changes