Pull in changes from #2340
Test case for #1335
Test case for #1754
Bump mongodb to 1.4.12
release 3.8.18
Merge branch '3.8.x' into gh-pages
website; <regen 3.8.18>