Merge branch 'whitespace'

Conflicts:
	Changelog
	src/double-conversion.cc
	src/double-conversion.h