Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org