Add scrubbing.
Merge branch 'master' into background-color