mouse.thread - correct zoom and drag
Merge remote-tracking branch 'origin/master'