Prepare 2.007 for 3.1 release.