Merge branch '2008_pty_buffer'