Merge from emacs-24; up to 2014-03-21T21:27:25Z!dancol@dancol.org