Merge tag 'v2_1_4' into dbussink-ruby-2-1-4

Conflicts:
	ChangeLog
	ext/openssl/lib/openssl/ssl.rb