Merge rails version update to 3.2.17