Merge branch 'master' into feature/server_split

common/djangoapps/pipeline_mako/__init__.py

common/djangoapps/static_replace.py

common/djangoapps/student/views.py

common/lib/capa/capa/capa_problem.py

common/lib/capa/capa/inputtypes.py

common/lib/xmodule/xmodule/capa_module.py

common/lib/xmodule/xmodule/modulestore/xml.py

common/lib/xmodule/xmodule/x_module.py

doc/development.md

lms/djangoapps/courseware/courses.py

lms/djangoapps/courseware/tests/tests.py

lms/djangoapps/courseware/views.py

lms/djangoapps/simplewiki/views.py

lms/djangoapps/staticbook/views.py

lms/envs/common.py

lms/urls.py