Merge master in prep for merging back the hotfix changes.

.gitignore

AUTHORS

CHANGELOG.rst

cms/djangoapps/auth/authz.py

cms/djangoapps/auth/tests/test_authz.py

...ontentstore/features/component_settings_editor_helpers.py

cms/djangoapps/contentstore/features/course-updates.feature

cms/djangoapps/contentstore/features/course-updates.py

cms/djangoapps/contentstore/features/static-pages.feature

cms/djangoapps/contentstore/features/static-pages.py

cms/djangoapps/contentstore/features/transcripts.feature

cms/djangoapps/contentstore/features/transcripts.py

cms/djangoapps/contentstore/features/video.feature

cms/djangoapps/contentstore/features/video.py

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_course_index.py

cms/djangoapps/contentstore/tests/test_course_settings.py

cms/djangoapps/contentstore/tests/test_import_export.py

cms/djangoapps/contentstore/tests/test_item.py

cms/djangoapps/contentstore/tests/test_permissions.py