Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka@jpl.org