am 84ae085d: am 1cf23e10: am 8661761c: better support for multiple files

* commit '84ae085dc7f37e03d4fe50fc7747f675df32fbb3':
  better support for multiple files