Merge branch 'master' into if_http

accounts/admin.py

appveyor.yml

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

course/calendar.py

course/enrollment.py

course/page/inline.py

doc/misc.rst

docker-image-run-py/Dockerfile

local_settings_example.py

requirements.txt

setup.py

tests/constants.py

tests/test_accounts/test_admin.py

tests/test_calendar.py

tests/test_enrollment.py

tests/test_pages/test_code.py

tests/test_pages/test_inline.py