Fix #894: Add conversions for UndefOr
Merge pull request #903 from gzm0/undefor-conversions

Fix #894: Add conversions for UndefOr