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

@nealstewart 
Is this for the channel? What is this?