Merge pull request #680 from kwhatmough/next

Minor fix to input test for non-mouse case. Make sure the mouse capture ...