Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This backports changes already made to master via: cookiecutter#1549 and cookiecutter#1548
- Loading branch information
This backports changes already made to master via: cookiecutter#1549 and cookiecutter#1548