Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at