am 8661761c: better support for multiple files

* commit '8661761cb691d9bed446b87d55a4fa7043a3aa95':
  better support for multiple files