#17079: test_ctypes now works with unittest test discovery.  Patch by Zachary Ware.
#17079: merge with 3.3.
#17082: test_dbm* now work with unittest test discovery.  Patch by Zachary Ware.
#17082: merge with 3.3.
Regex should be a raw string
Merge
Don't deadlock on a reentrant call.
Merge
#16935: unittest now counts the module as skipped if it raises SkipTest, instead of counting it as an error.  Patch by Zachary Ware.
#16935: update test_crypt now that unittest discover understands SkipTest.
#17315: unlink a file that test_posixpath was leaving around.
#17315: merge with 3.2.
#17315: merge with 3.3.
#17312: unlink a file that test_aifc was leaving around.
Fix markup in unittest doc.
Merge markup fixes in unittest doc from 3.2.
Merge markup fixes in unittest doc from 3.3.