Merge remote-tracking branch 'remotes/upstream/master' into django20

.gitignore

.gitlab-ci.yml

.travis.yml

README.rst

accounts/models.py

accounts/utils.py

accounts/views.py

bin/relate

contrib/course-material-tree/make-tree-html

course/analytics.py

course/auth.py

course/constants.py

course/content.py

course/enrollment.py

course/flow.py

course/grades.py

course/grading.py

course/page/base.py

course/page/choice.py

course/page/code.py