Merge pull request #3718 from naglis/tv3play