Merge pull request #2922 from akoeplinger/fix-tvos