Merge branches 'tv-cmd-api', 'tv-git-version', 'tv-gitignore' and 'tv-kludge-issue7240' into tv-all