merge from 3.3

Add -b and -X options to python man page.
Patch contributed by Corey Brune.