Issue #20644: Keep build-installer.py in sync across active versions.
Issue #21187: Fix OS X installer fail-to-build with Xcode 5.1.
add matrix multiplication operator support to 2to3
teach 2to3 about 'yield from'
Issue #21172: isinstance check relaxed from dict to collections.Mapping.
Issue #21170: Removed invalid parameter names from unittest doc.
Patch by Kushal Das.
Remove references to the obsolete Mac Carbon modules in the GUI
section of the FAQ.
Issue #21171: Fixed undocumented filter API of the rot13 codec.
Patch by Berker Peksag.
Issue #20635: Added tests for Tk geometry managers.
#21169: fix getpass to use replace error handler on UnicodeEncodeError.

If the input stream encoding couldn't encode one or more of the
non-ascii characters in the prompt, it would fail, throwing a
UnicodeEncodeError.  Now if that happens we re-encoding using the
'replace' error handler.

Patch by Kushal Das.
in scan_once, prevent the reading of arbitrary memory when passed a negative index

Bug reported by Guido Vranken.
merge 3.2
merge 3.3
fix sending tuples to custom generator objects with yield from (closes #21209)

Debugged by Victor.
Fix text about int() with octal numbers. Closes #21212.
Fix faq example with division.
#21169: add comment and doc update for getpass change.
Issue #20624: Exception docs wording tweak - clarify that it's okay to inherit from a subclass of Exception.
Issue 20968. unittest.mock.MagicMock now supports division
Merge