provgron-1077
Merge branch 'master' of https://github.com/PythonUnited/djinn_contenttypes