Fix Coffee syntax error
Merge branch 'edge' of github.com:sfu/canvas-lms into edge