Merge pull request #8376 from rrooij/schooltv