Merge branch 'bug_355_seek_fixes'