#18588: update the timeit examples to be consistent.
#18588: merge with 3.4.
#20977: fix undefined name in the email module.  Patch by Rose Ames.
#20977: merge with 3.4.