Attach terminal for shipyard.
more tweaks on terminal support from ukd1 and diffoperator
Merge branch 'master' into terminal
Merge branch 'master' into terminal
Merge branch 'terminal'