Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org