point to the correct activesupport gem
Merge branch 'master' into DS-1008