victorg
committed
on 12 Sep 13
merging fixes from oacs-5-1 to HEAD.