Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org