rails 3.2.17
Merge branch '3_2_17'