am 2d139fcf: am 0488079d: Merge "Fix the computation of basefilename"

* commit '2d139fcf2916ad6d0008cf32a2fc1c2899eda3ff':
  Fix the computation of basefilename