Merge branch 'master' into ng/master

* master:
  tests: some improvements to Gettext tests
  post-release: micro version bump (1.13.4a)
  release: stable micro release 1.13.4
  sync: update config.guess

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc t/gettext-external-pr338.sh
index 48ea3971326eed261844f20e4eb62e9fd5a85827,c82af69954b888338f6a1b426b3bf7921bc53835..01b35ff64784d2a4da11adbf24e859e4bea3de4f
--- 1/t/gettext2.sh
--- 2/t/gettext-external-pr338.sh
+++ b/t/gettext-external-pr338.sh
@@@ -48,8 -48,10 +48,10 @@@ grep 'AM_GNU_GETTEXT.*po' stder
  echo 'SUBDIRS = po' >Makefile.am
  $AUTOMAKE --add-missing
  
 -
  # Don't try running ./configure --with-included-gettext if the
  # user is using AM_GNU_GETTEXT([external]).
++
+ grep 'with-included-gettext' Makefile.in && exit 1
  ./configure
  $MAKE -n distcheck | grep 'with-included-gettext' && exit 1