Merged in Krauss docutils fix