Merge 3.5

author Victor Stinner <victor.stinner@gmail.com>

Fri, 30 Dec 2016 01:15:29 +0000 (02:15 +0100)

committer Victor Stinner <victor.stinner@gmail.com>

Fri, 30 Dec 2016 01:15:29 +0000 (02:15 +0100)
author Victor Stinner <victor.stinner@gmail.com>
Fri, 30 Dec 2016 01:15:29 +0000 (02:15 +0100)
committer Victor Stinner <victor.stinner@gmail.com>
Fri, 30 Dec 2016 01:15:29 +0000 (02:15 +0100)
diff --cc Doc/library/tracemalloc.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Fri, 30 Dec 2016 01:15:29 +0000 (02:15 +0100)
committer	Victor Stinner <victor.stinner@gmail.com>
	Fri, 30 Dec 2016 01:15:29 +0000 (02:15 +0100)
		1	2
Doc/library/tracemalloc.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history