Merge bmamlin's hover-time change (Closes #1)