Update to latest from ttk2's repo