Merge branch 'mousewheel' into sagecell