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