Merge from emacs-24; up to 2012-12-20T16:09:05Z!dmantipov@yandex.ru