Merge branch 'master' into 'new-game-features'

# Conflicts:
#   env/build/openedx/themes/indigo/lms/templates/course.html
#   env/build/openedx/themes/indigo/lms/templates/dashboard/_dashboard_course_listing.html
#   env/build/openedx/themes/indigo/lms/templates/header/navbar-authenticated.html
#   themes/indigo/theme/lms/templates/course.html
#   themes/indigo/theme/lms/templates/dashboard/_dashboard_course_listing.html
#   themes/indigo/theme/lms/templates/header/navbar-authenticated.html