Issue #28203: Merge from 3.6

author Mark Dickinson <dickinsm@gmail.com>

Sat, 24 Sep 2016 14:29:07 +0000 (15:29 +0100)

committer Mark Dickinson <dickinsm@gmail.com>

Sat, 24 Sep 2016 14:29:07 +0000 (15:29 +0100)
author Mark Dickinson <dickinsm@gmail.com>
Sat, 24 Sep 2016 14:29:07 +0000 (15:29 +0100)
committer Mark Dickinson <dickinsm@gmail.com>
Sat, 24 Sep 2016 14:29:07 +0000 (15:29 +0100)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Mark Dickinson <dickinsm@gmail.com>
	Sat, 24 Sep 2016 14:29:07 +0000 (15:29 +0100)
committer	Mark Dickinson <dickinsm@gmail.com>
	Sat, 24 Sep 2016 14:29:07 +0000 (15:29 +0100)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history