am 93efff32: Merge "Added in change to ensure file name is passed through debug info"

* commit '93efff329f0b18aea5ab8e52340f0ddc542824c0':
  Added in change to ensure file name is passed through debug info