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 Job ID Name Coverage
  Test
passed #6190
test_api

00:02:18

passed #6191
test_web

00:01:07