Merge: #24903: Remove misleading error message to fix regression.

author R David Murray <rdmurray@bitdance.com>

Sat, 5 Dec 2015 04:05:20 +0000 (23:05 -0500)

committer R David Murray <rdmurray@bitdance.com>

Sat, 5 Dec 2015 04:05:20 +0000 (23:05 -0500)
author R David Murray <rdmurray@bitdance.com>
Sat, 5 Dec 2015 04:05:20 +0000 (23:05 -0500)
committer R David Murray <rdmurray@bitdance.com>
Sat, 5 Dec 2015 04:05:20 +0000 (23:05 -0500)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Sat, 5 Dec 2015 04:05:20 +0000 (23:05 -0500)
committer	R David Murray <rdmurray@bitdance.com>
	Sat, 5 Dec 2015 04:05:20 +0000 (23:05 -0500)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history