Merge branch 'master' into feature/server_split

...on/djangoapps/pipeline_mako/templates/static_content.html

common/djangoapps/static_replace.py

...goapps/student/management/commands/create_random_users.py

common/djangoapps/student/views.py

common/lib/capa/capa/inputtypes.py

common/lib/capa/capa/responsetypes.py

common/lib/capa/capa/templates/filesubmission.html

common/lib/capa/capa/templates/textbox.html

common/lib/xmodule/xmodule/abtest_module.py

common/lib/xmodule/xmodule/css/capa/display.scss

common/lib/xmodule/xmodule/js/src/capa/display.coffee

common/lib/xmodule/xmodule/js/src/sequence/display.coffee

common/lib/xmodule/xmodule/modulestore/mongo.py

common/lib/xmodule/xmodule/modulestore/xml.py

common/lib/xmodule/xmodule/tests/test_import.py

common/lib/xmodule/xmodule/x_module.py

common/static/images/spinner.gif

lms/djangoapps/courseware/courses.py

lms/djangoapps/courseware/grades.py

lms/djangoapps/courseware/module_render.py