Allow union types within signatures
Merge branch 'master' into mammoth