Merge into the trailofbits/binjascripts repo
Merge into the trailofbits/binjascripts repo