Merge branch 'pt/non-mouse-usage' into pu

Pat Thoyts committed Oct 3, 2016 at 23:30 UTC 99ba48e397995a4b06a57f78e5611a29d239e5ea

No changes.