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

@nealstewart 
(the exception that gets re-thrown has a 'illegal selector' message, it just doesn't say what the selector is).