More work on parsing/debug output.
Merge remote-tracking branch 'origin/master'