fixed seeker
Merge branch 'master' into redo-seeker