Ruby upgrade

This change upgrades the required Ruby version to 1.9.3-p545.

[#66342314]
Merge 66342314-ruby-upgrade to 1.5.x

[Completes #66342314]
Merge branch '1.5.x' into 2.0.x
Merge branch '2.0.x'

Conflicts:
	.travis.yml
	Gemfile.lock