Thanks to Glenn Morris for this fix in Emacs trunk. Conflicts: lisp/ob-emacs-lisp.el lisp/ob-perl.el lisp/ob-python.el lisp/ob-ruby.el lisp/ob-screen.el lisp/org-eshell.el lisp/org-mouse.el