Update TSK to latest master