Mouse hover issue resolved
Merge remote-tracking branch 'upstream/master'