more flexible rails dependency
Merge branch 'rails4.0.12'