Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de