Branch merge.
Fixed mouseover bug.
Fixed mouseover bug.