Merge remote-tracking branch 'upstream/master' into timeshift_and_epg
Merge pull request #3 from jdembski/timeshift_and_epg

Merge remote-tracking branch 'upstream/master' into timeshift_and_epg