Merge branch 'maint'

Merge branch 'maint'

* maint:
  config headers: remove stale comment in makefile fragment
  NEWS: wording and quoting fixlets in few older entries
  config headers: don't emit rules for headers not generated by autoheader
  docs: fix minor typo: s/expending/expanding/
  sync: update files from upstream with "make fetch"
  maint: post-release minor version bump
  maint: typo fixes s/lies into/lies in/
  release: stable release 1.12.4
  NEWS: minor fix

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