Merge remote-tracking branch 'tjoppen/opatom_demuxing_and_seeking'