Merge branch 'maint'

* maint:
apply: remove directory that becomes empty by renaming the last file away
setup.c:verify_non_filename(): don't die unnecessarily while disambiguating

diff --cc builtin-apply.c
Simple merge

diff --cc setup.c
Simple merge