Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org