Merged branch stdio_rewrite back into trunk.