Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org