Merge branch 'mouse-wheel'