Merge from emacs-24; up to 2013-01-01T11:02:14Z!rudalics@gmx.at