[TV] - :tomato: 2.5
Merge pull request #735 from michalbe/master

[TV] - 2.5