Preliminary changes for 7beta2.
Preliminary changes for 7beta2.

hoanganhx86/SeriesGuide,artemnikitin/SeriesGuide,UweTrottmann/SeriesGuide,0359xiaodong/SeriesGuide,r00t-user/SeriesGuide,epiphany27/SeriesGuide,UweTrottmann/SeriesGuide