Checkout
icing
committed
on 31 Mar 17
On the trunk:

update after backport to 2.4.x