victorg
committed
on 08 Jul 15
Backporting fix from HEAD.