Trilead SSH2 patch merged upstream; amend appropriately