Upstream sync

Jiri Bencrequested to merge
jbencrh/tview:upstream-sync into master

This syncs up tview to upstream and fixes the resulting fallout.

Merge request reports