Merge branch 'django1.8' into django1.9

* django1.8:
This commit is contained in:
Samuel Clay 2020-06-26 16:27:45 -04:00
commit b36df82ba0

Diff content is not available