[TV] - 2.5
Merge pull request #407 from michalbe/master

[TV] - 2.5