Fixing issue where package cannot be installed if Django is not already installed
Merge branch 'master' into develop