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

cms/djangoapps/contentstore/views.py

cms/envs/test.py

cms/static/coffee/spec/main_spec.coffee

cms/static/coffee/spec/models/module_spec.coffee

cms/static/coffee/spec/views/module_edit_spec.coffee

cms/static/coffee/spec/views/module_spec.coffee

cms/static/coffee/spec/views/week_spec.coffee

cms/static/coffee/src/models/module.coffee

cms/static/coffee/src/views/module_edit.coffee

cms/templates/widgets/sequence-edit.html

common/djangoapps/pipeline_mako/__init__.py

...on/djangoapps/pipeline_mako/templates/static_content.html

common/djangoapps/static_replace.py

...goapps/student/management/commands/create_random_users.py

common/djangoapps/student/models.py

common/djangoapps/student/tests.py

common/djangoapps/student/views.py

common/djangoapps/xmodule_modifiers.py

common/lib/capa/capa/capa_problem.py

common/lib/capa/capa/inputtypes.py