Conflicts: cms/envs/common.py cms/templates/base.html common/lib/xmodule/xmodule/combined_open_ended_module.py
