Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org