Checkout
ylavic
committed
on 28 Sep 15
Follow up to r1705672.
Backport changes that somehow missed the backport process.