Merge tag 'v2.5.1'

Tagging v2.5.1.

Conflicts:
	lib/mechanize/cookie.rb
	test/test_mechanize_cookie.rb