Merge "Moved to a more openbsd-like fenv.h"