Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

cms/envs/dev.py

cms/envs/test.py

common/djangoapps/mitxmako/README

common/djangoapps/mitxmako/__init__.py

common/djangoapps/mitxmako/makoloader.py

common/djangoapps/mitxmako/middleware.py

common/djangoapps/mitxmako/shortcuts.py

common/djangoapps/mitxmako/template.py

common/djangoapps/mitxmako/templatetag_helpers.py

common/djangoapps/static_replace.py

common/djangoapps/student/models.py

common/lib/capa/capa/responsetypes.py

common/lib/capa/capa/templates/textinput.html

common/lib/mitxmako/setup.py

common/lib/xmodule/setup.py

common/lib/xmodule/xmodule/backcompat_module.py

common/lib/xmodule/xmodule/capa_module.py

common/lib/xmodule/xmodule/css/capa/display.scss

common/lib/xmodule/xmodule/css/video/display.scss

common/lib/xmodule/xmodule/html_module.py