gustafn
committed
on 15 Dec 18
backport from oacs-5-9, which might avoid problems with oacs 5-8 when used with recent versions of nsf