Parse type unions
Merge branch 'master' into mammoth