Merge branch 'master' of ssh://coffee.fas.sfu.ca/home/git/courses


Former-commit-id: af87a52b06114654ec9b2d6ed55f485caebc8556
Merge branch 'master' into groups-update