Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru