Merge change up to right before new-year copyright bumping

Merge commit 'beae0bdcf7fe30f2415c16f6b8c1368d469e519c'

Conflicts:
	ChangeLog
	build-aux/config.guess
	doc/maintain.texi
	doc/standards.texi

diff --combined gnulib-tool
index 84be8a7,669931c..cf22e54
--- 1/gnulib-tool
--- 2/gnulib-tool
+++ b/gnulib-tool
@@@ -323,13 -323,12 +323,13 @@@
      version=' '`cd "$gnulib_dir" && ./build-aux/git-version-gen /dev/null | sed -e 's/-dirty/-modified/'`
    else
      # gnulib copy without versioning information.
 -    date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog`
 -    version=
 +    date=`zcat /usr/share/doc/gnulib/changelog.gz | sed -e 's/ .*//;q'`
 +    version=`zcat /usr/share/doc/gnulib/NEWS.stable.gz | grep -o -m 1 ' [0-9]\+-stable'`
 +    debversion=`dpkg-query --show --showformat '${Version}' gnulib`
    fi
    year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed -e 's,^.* ,,'`
    echo "\
 -gnulib-tool (GNU $package $date)$version
 +gnulib-tool (GNU $package $date)$version Debian: $debversion
  Copyright (C) $year Free Software Foundation, Inc.
  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
  This is free software: you are free to change and redistribute it.
@@@ -454,7 -453,7 +454,7 @@@ func_gnulib_dir (
        * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
      esac
    done
 -  gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
 +  gnulib_dir=/usr/share/gnulib
  }
  
  # func_tmpdir
@@@ -899,6 -898,9 +899,9 @@@ if test "X$1" = "X--no-reexec"; the
    shift
  fi
  
+ # Unset CDPATH.  Otherwise, output from 'cd dir' can surprise callers.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
  # Command-line option processing.
  # Removes the OPTIONS from the arguments. Sets the variables:
  # - mode            one of: list, find, import, add-import, remove-import,