Merge tag 'v2_1_3' into dbussink/ruby-2-1-3

Conflicts:
	ChangeLog
	gc.c
	string.c
	test/ruby/test_file_exhaustive.rb
	test/test_timeout.rb