Merge from emacs-24; up to 2012-11-13T18:57:26Z!dgutov@yandex.ru