Subject: bug#18527: the fix for this bug was clobbered by a subsequent merge commit

From: Chris Brannon <[email-masked]>
Date: Fri, 25 Mar 2016 11:21:12 -0700

This was fixed with commit
d686802510c3902f6be4a4c4e82b1134d9dfb8a0,
but the fix was clobbered by the merge commit
9f2f14a0725211b13a744573344636b57b9c98b9.