mixin non-d1 friendly
Merge pull request #9 from JesseKPhillips/d1build

mixin non-d1 friendly