TerminalLink: updated interface to match
Merge remote-tracking branch 'ba/master'