Squash some Sphinx warnings
Prepare for 3.1 release