Rails 3.1.10.

Rationale: CVE-2013-0155, CVE-2013-0156.
(cherry picked from commit dedf1e5f841023c782edbf078e1a3afeaf082733)

Conflicts:
	Gemfile.lock