Merge pull request #1615 from jonmhays/master

CLC-2473 - Update canvas_user_activities.rb