Fix for CVE-2013-0156

Conflicts:

	Gemfile
	Gemfile.lock