Merge everything before "ts.gui" changes...

@nealstewart