Fix committed in r1615289. Will propose for backport to 2.4 next week if no negative reactions come up in the meantime.
Fix committed in r1615289.
Will propose for backport to 2.4 next week if no negative reactions come up in the meantime.