Merge from emacs-24; up to 2012-12-13T09:45:54Z!lekktu@gmail.com