Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org