Merge branch '3.3-maint'

* 3.3-maint:
  Fix detection of missing argument to -opt/--options-file

diff --cc NEWS.txt
Simple merge

diff --cc ccache.c
Simple merge