Conflicts: cms/templates/widgets/header.html lms/djangoapps/courseware/courses.py lms/djangoapps/courseware/tests/test_courses.py
