moved mouse stuff
Merge commit 'c4e7bf1'

* commit 'c4e7bf1':
  moved mouse stuff