Major merge with Emacs source tree. Docutils SVN version and Emacs