Merge remote-tracking branch 'origin/master' into feature/android

diff --cc admin/merge-gnulib
index 4e84e1a2c8d0267e1324fc504e877418317b28c5,917ddda1fd59936afc8de032f98f564212aeaa4f..8065a9267d04d4dbc5feaa6ee40c3c938288525d
--- 1/admin/merge-gnulib
--- 2/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@@ -42,11 -42,11 +42,11 @@@ GNULIB_MODULES=
    manywarnings memmem-simple mempcpy memrchr memset_explicit
    minmax mkostemp mktime
    nanosleep nproc nstrftime
 -  pathmax pipe2 pselect pthread_sigmask
 +  pathmax pipe2 printf-posix vasprintf-posix pselect pthread_sigmask
    qcopy-acl readlink readlinkat regex
    sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio
 -  stpcpy strnlen strtoimax symlink sys_stat sys_time
 +  stpcpy stpncpy strnlen strtoimax symlink sys_stat sys_time
-   tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
+   tempname time-h time_r time_rz timegm timer-time timespec-add timespec-sub
    update-copyright unlocked-io utimensat
    vla warnings
  '

diff --cc lib/gnulib.mk.in
index a5be32427b66fac54fd2e473d0ee2608a514da27,47d08a5e27f17e0051d08ba9d8de960ae378cf0e..ca4df18458c10b86aa7ef64221d1c24485101059
--- 1/lib/gnulib.mk.in
--- 2/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@@ -719,9 -595,7 +719,10 @@@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVE
  GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
  GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
  GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
 +GL_GNULIB_TANF = @GL_GNULIB_TANF@
 +GL_GNULIB_TANHF = @GL_GNULIB_TANHF@
 +GL_GNULIB_TANL = @GL_GNULIB_TANL@
+ GL_GNULIB_TIME = @GL_GNULIB_TIME@
  GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
  GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
  GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@@ -1533,8 -1210,7 +1534,9 @@@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX
  REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
  REPLACE_SYMLINK = @REPLACE_SYMLINK@
  REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
 +REPLACE_TANF = @REPLACE_TANF@
 +REPLACE_TANHF = @REPLACE_TANHF@
+ REPLACE_TIME = @REPLACE_TIME@
  REPLACE_TIMEGM = @REPLACE_TIMEGM@
  REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
  REPLACE_TMPFILE = @REPLACE_TMPFILE@

diff --cc m4/gnulib-comp.m4
Simple merge