Merge from emacs-24; up to 2014-07-28T02:47:29Z!fgallina@gnu.org