Rails security patches hotfix
Merge branch 'new-deploy' of github.com:sfu/canvas-lms into new-deploy