Merge from upstream

[stvstnfrd]

Merge Code

git merge --no-ff hotfix-2015-08-20

Resolve Conflicts

• [x] CHANGELOG.rst
• [x] cms/djangoapps/contentstore/tests/test_course_settings.py
• [x] cms/djangoapps/contentstore/utils.py
• [x] cms/djangoapps/contentstore/views/component.py
• [x] cms/djangoapps/contentstore/views/tabs.py
• [x] cms/djangoapps/models/settings/course_details.py
• [x] cms/envs/aws.py
• [x] cms/envs/common.py
• [x] cms/static/cms/js/require-config.js
• [x] cms/static/js/models/settings/course_details.js
• [x] cms/static/js/views/settings/main.js
• [x] cms/static/sass/_base.scss
• [x] cms/static/sass/elements/_header.scss
• [x] cms/templates/js/add-xblock-component-menu-problem.underscore
• [x] cms/templates/widgets/header.html
• [x] common/djangoapps/student/models.py
• [x] common/djangoapps/student/tests/tests.py
• [x] common/djangoapps/student/views.py
• [x] common/djangoapps/third_party_auth/provider.py
• [x] common/lib/capa/capa/responsetypes.py
• [x] common/lib/capa/capa/templates/choicegroup.html
• [x] common/lib/capa/capa/tests/test_files/extended_hints_checkbox.xml
• [x] common/lib/capa/capa/tests/test_files/extended_hints_with_errors.xml
• [x] common/lib/capa/capa/tests/test_hint_functionality.py
• [x] common/lib/xmodule/xmodule/capa_base.py
• [x] common/lib/xmodule/xmodule/course_module.py
• [x] common/lib/xmodule/xmodule/css/capa/display.scss
• [x] common/lib/xmodule/xmodule/js/fixtures/video.html
• [x] common/lib/xmodule/xmodule/js/fixtures/video_all.html
• [x] common/lib/xmodule/xmodule/js/fixtures/video_html5.html
• [x] common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html
• [x] common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html
• [x] common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
• [x] common/lib/xmodule/xmodule/js/spec/problem/edit_spec_hint.coffee
• [x] common/lib/xmodule/xmodule/js/src/capa/display.coffee
• [x] common/lib/xmodule/xmodule/js/src/video/01_initialize.js
• [x] common/lib/xmodule/xmodule/js/src/video/03_video_player.js
• [x] common/lib/xmodule/xmodule/tabs.py
• [x] common/lib/xmodule/xmodule/templates/problem/checkboxes_response_hint.yaml
• [x] common/lib/xmodule/xmodule/templates/problem/multiplechoice_hint.yaml
• [x] common/lib/xmodule/xmodule/templates/problem/numericalresponse_hint.yaml
• [x] common/lib/xmodule/xmodule/templates/problem/optionresponse_hint.yaml
• [x] common/lib/xmodule/xmodule/templates/problem/string_response_hint.yaml
• [x] common/lib/xmodule/xmodule/tests/test_tabs.py
• [x] common/lib/xmodule/xmodule/video_module/video_module.py
• [x] common/test/acceptance/pages/lms/problem.py
• [x] common/test/acceptance/tests/lms/test_lms_problems.py
• [x] lms/djangoapps/branding/tests/test_page.py
• [x] lms/djangoapps/branding/views.py
• [x] lms/djangoapps/bulk_email/tasks.py
• [x] lms/djangoapps/certificates/management/commands/ungenerated_certs.py
• [x] lms/djangoapps/certificates/queue.py
• [x] lms/djangoapps/certificates/views.py
• [x] lms/djangoapps/class_dashboard/dashboard_data.py
• [x] lms/djangoapps/courseware/access.py
• [x] lms/djangoapps/courseware/module_render.py
• [x] lms/djangoapps/courseware/tabs.py
• [x] lms/djangoapps/courseware/tests/test_access.py
• [x] lms/djangoapps/courseware/tests/test_module_render.py
• [x] lms/djangoapps/courseware/tests/test_video_mongo.py
• [x] lms/djangoapps/courseware/views.py
• [x] lms/djangoapps/dashboard/sysadmin.py
• [x] lms/djangoapps/dashboard/tests/test_sysadmin.py
• [x] lms/djangoapps/django_comment_client/forum/tests.py
• [x] lms/djangoapps/instructor/tests/test_api.py
• [x] lms/djangoapps/instructor/utils.py
• [x] lms/djangoapps/instructor/views/api_urls.py
• [x] lms/djangoapps/instructor/views/instructor_dashboard.py
• [x] lms/djangoapps/instructor_analytics/tests/test_basic.py
• [x] lms/djangoapps/instructor_task/api.py
• [x] lms/djangoapps/instructor_task/tasks.py
• [x] lms/djangoapps/instructor_task/tasks_helper.py
• [x] lms/djangoapps/instructor_task/tests/test_api.py
• [x] lms/djangoapps/instructor_task/tests/test_tasks.py
• [x] lms/djangoapps/instructor_task/tests/test_tasks_helper.py
• [x] lms/djangoapps/lti_provider/tests/test_views.py
• [x] lms/djangoapps/mobile_api/testutils.py
• [x] lms/djangoapps/student_account/views.py
• [x] lms/djangoapps/verify_student/tests/test_views.py
• [x] lms/envs/aws.py
• [x] lms/envs/common.py
• [x] lms/static/coffee/src/instructor_dashboard/data_download.coffee
• [x] lms/static/js/spec/views/fields_spec.js
• [x] lms/static/js/student_account/views/account_settings_factory.js
• [x] lms/templates/courseware/course_navigation.html
• [x] lms/templates/courseware/courses.html
• [x] lms/templates/courseware/courseware.html
• [x] lms/templates/courseware/progress.html
• [x] lms/templates/dashboard.html
• [x] lms/templates/dashboard/_dashboard_course_listing.html
• [x] lms/templates/instructor/instructor_dashboard_2/send_email.html
• [x] lms/templates/main_django.html
• [x] lms/templates/navigation.html
• [x] lms/templates/student_account/account_settings.html
• [x] lms/templates/sysadmin_dashboard.html
• [x] lms/templates/video.html
• [x] requirements/edx/github.txt

  Pass Tests

• tbd

[stvstnfrd]

@kluo @dcadams @caesar2164

I'm going to use this to track progress.