victorg
committed
on 02 Jun 15
backporting fix from oacs-5-8.