Handle hovering a bit differently.
Merge branch 'v3' into Av2