Upgraded Rails to 3.1.10 as per (even more recent) security recommendations.
See http://j.mp/XKoMpf for details.
Merge branch 'master' into develop