96a54c15

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into ignore-nix
configuredevShellx86_64-linuxx86_64-linux