victorg
committed
on 12 Sep 13
merging all changes from oacs-5-2 back to HEAD.