Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org