Fix# crash on new school
Merge remote-tracking branch 'origin/capistrano' into capistrano