Fix child crash
Misc output changes.
Merge branch 'master' into mesa