Merge from emacs-24; up to 2014-06-26T21:51:25Z!rgm@gnu.org.