Merge branch 'master' into specific-error-handling

.gitignore

djangoapps/courseware/capa/capa_problem.py

djangoapps/courseware/capa/inputtypes.py

djangoapps/courseware/capa/responsetypes.py

djangoapps/courseware/content_parser.py

djangoapps/courseware/grades.py

djangoapps/courseware/module_render.py

djangoapps/courseware/modules/capa_module.py

djangoapps/courseware/test_files/optionresponse.xml

djangoapps/courseware/tests.py

djangoapps/courseware/views.py

djangoapps/multicourse/__init__.py

djangoapps/multicourse/multicourse_settings.py

djangoapps/multicourse/views.py

djangoapps/simplewiki/views.py

djangoapps/ssl_auth/__init__.py

djangoapps/ssl_auth/ssl_auth.py

envs/aws.py

envs/common.py

envs/content.py