Bump rails to 3.2.13
Merge branch 'master' into develop