Merge branch 'akirk-nowtv'