Issue #15812: Merge from 3.5

author Berker Peksag <berker.peksag@gmail.com>

Mon, 2 Jan 2017 03:59:12 +0000 (06:59 +0300)

committer Berker Peksag <berker.peksag@gmail.com>

Mon, 2 Jan 2017 03:59:12 +0000 (06:59 +0300)
author Berker Peksag <berker.peksag@gmail.com>
Mon, 2 Jan 2017 03:59:12 +0000 (06:59 +0300)
committer Berker Peksag <berker.peksag@gmail.com>
Mon, 2 Jan 2017 03:59:12 +0000 (06:59 +0300)
diff --cc Lib/inspect.py
Simple merge
diff --cc Lib/test/test_inspect.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Berker Peksag <berker.peksag@gmail.com>
	Mon, 2 Jan 2017 03:59:12 +0000 (06:59 +0300)
committer	Berker Peksag <berker.peksag@gmail.com>
	Mon, 2 Jan 2017 03:59:12 +0000 (06:59 +0300)
		1	2
Lib/inspect.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_inspect.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history