Merge "Use strtod to read a double rather than operator >>"