gustafn
committed
on 07 Mar 17
applied changes provided by Brian for oracle. For details, see issue #3302