Bump up rails version to 4.1.7
Merge branch 'rails4.1.7'