Merge branch 'bug_461_play_another_timeshift_file_after_eof' into experimental