rails version inclusion
Merge branch 'hotfix/1.0.7'