gustafn
committed
on 28 Dec
Ported essential post-release fixes from oacs-5-10 branch