Better SSH display
Merge branch 'agile_ip' into ttl