Merge branch '3665_netbsd_curses'