Allow activesupport >= 3.2