Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org