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)