Merge branch 'master' into '12-instructor-model'

# Conflicts:
#   schedules_api/db/seeds.rb
2 jobs for 12-instructor-model in 2 minutes and 18 seconds (queued for 4 seconds)
Status Name Job ID Coverage
  Test
passed test_api #6190

00:02:18

passed test_web #6191

00:01:07