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

@nealstewart 
Error message wording will be in a separate pull request since we'll have to come up with a higher order mechanism that will allow us to Tradeshift-stamp all of them.