Merge remote-tracking branch 'origin/master' into 700x-sandbox

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_course_settings.py

cms/djangoapps/contentstore/tests/tests.py

cms/djangoapps/contentstore/tests/utils.py

cms/djangoapps/models/settings/course_grading.py

cms/static/js/views/overview.js

cms/static/js/views/settings/main_settings_view.js

common/djangoapps/course_groups/tests/tests.py

common/djangoapps/status/tests.py

common/djangoapps/util/converters.py

common/lib/capa/capa/responsetypes.py

common/lib/capa/capa/templates/codeinput.html

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/modulestore/xml_exporter.py

common/lib/xmodule/xmodule/templates.py

common/lib/xmodule/xmodule/timelimit_module.py

...rc/discussion/views/discussion_thread_profile_view.coffee

...e/src/discussion/views/discussion_thread_show_view.coffee

...ee/src/discussion/views/response_comment_show_view.coffee

...fee/src/discussion/views/thread_response_show_view.coffee