victorg
committed
on 17 Sep 13
Merging back fixes on oacs-5-2 to HEAD.