Merge branch 'master' into setup-hs-args
# Conflicts: # nix-tools/cabal.project # nix-tools/nix-tools/make-install-plan/ProjectPlanOutput.hs # nix-tools/overlay.nix