Major speed-up.
Merge branch 'master' into pathogen-bundle