Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru