Merged with rev. 1505.
Merge branch 'master' into atsc_epg