Cherry-picked "security patch for JSON security flaw"

Conflicts:
	Gemfile.lock  (oci-8 stuff)