Greatly improved tool event handling
Merge branch 'master' of https://github.com/EGreg/Q