Mantis #2817 : http://mantis.team-mediaportal.com/view.php?id=2817
Resume Music Playlist when user cancel dialog in MyVideo.
Merge branch 'master' into BUG-2817-Canceling_a_playback_resume_dialog_adds_video_and_DVD_to_playlist
Merge remote-tracking branch 'remotes/origin/BUG-4279-TsWriter_can_sometimes_use_incorrect_SDT'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music
Merge remote-tracking branch 'remotes/upstream/BUG-2817-Canceling_a_playback_resume_dialog_adds_video_and_DVD_to_playlist' into 1.3Final_ADDON3_TV_Music

Conflicts:
	mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoFiles.cs