Imported Upstream version 1.8.7.371
Merge tag 'upstream/1.8.7.371'

Upstream version 1.8.7.371

Conflicts:
	configure
	parse.c
ruby1.8 (1:1.8.7.371-1bbox1)