Merge remote-tracking branch 'teacher/master'