[TV] - :watermelon: 2.5
Merge pull request #790 from michalbe/master

[TV] - 2.5