Merged FSF changes into org-mouse.el.