Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org