Oasis: fix optional dependency on type_conv
Merge branch 'branch-0.6'

Conflicts:
	_oasis