Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru