Upgrade to Rails 3.2.17.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile.lock