Merge "Added in fix to allow generation of valid debug info"