Conflicts: common/lib/xmodule/seq_module.py common/lib/xmodule/xmodule/capa_module.py lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/djangoapps/multicourse/multicourse_settings.py
