Merge branch 'master' of caffeine.uwaterloo.ca:/users/www/www