try again with the Gemfile.lock for 1.9.3
Merge branch 'sfu-develop' of github.com:sfu/canvas-lms into sfu-develop
Merge remote-tracking branch 'sfu/sfu-develop' into sfu-develop
Merge pull request #46 from grahamb/sfu-develop

try again with the Gemfile.lock for 1.9.3