Merge pull request #408 from mithro/make-env-update

Update `make-env` submodule.