Merge branch 'karsten_bug13192_026_03_teor'

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/test/test_util.c
index 0a5783e9f5fa8bccab711076a709df8472056423,f96a362a6f7d9320d9d435c0b28847dc8e2bb6db..208186c7d5eae32b09f5462ce1f2e5d3569f0737
--- 1/src/test/test_util.c
--- 2/src/test/test_util.c
+++ b/src/test/test_util.c
@@@ -4438,9 -4488,9 +4600,10 @@@ struct testcase_t util_tests[] = 
    UTIL_LEGACY(path_is_relative),
    UTIL_LEGACY(strtok),
    UTIL_LEGACY(di_ops),
 +  UTIL_TEST(di_map, 0),
    UTIL_TEST(round_to_next_multiple_of, 0),
    UTIL_TEST(laplace, 0),
+   UTIL_TEST(clamp_double_to_int64, 0),
    UTIL_TEST(find_str_at_start_of_line, 0),
    UTIL_TEST(string_is_C_identifier, 0),
    UTIL_TEST(asprintf, 0),