support rails 3.2
Merge branch 'rails_3_2'