doc updates
try to fix core dump that happens while spidering.
Merge branch 'master' into testing