modified:   app/models/video.rb
Merge remote-tracking branch 'upstream/master'