am 24d69e52: Merge "Added in fix to allow generation of valid debug info"

* commit '24d69e521538d70863dc0a3745733b8c27fcccd7':
  Added in fix to allow generation of valid debug info