Enhancements to Hover and a couple of bug fixes
Merge remote-tracking branch 'origin/master'