Nick Coghlan <ncogh...@gmail.com> added the comment:
+1 from me for making the change 3.7.0+ only - 3.6 isn't doing the right thing,
but given folks are relying on it doing the wrong thing, then let's leave it
alone given where it is in its lifecycle.