Merge remote-tracking branch 'upstream/bizo' into bizo

* upstream/bizo:
Only put in transitive sources for non-optional deps
Merge pull request #2 from mdietz198/bizo

Bizo