Merge r67419 to py3k, mp doc fixes
1 file changed