Merge upstream as of b6d0b41

Merge in upstream changes from boxen/our-boxen@b6d0b41