Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org