Changed object highlight effect from wireframe to white.
Merge remote-tracking branch 'origin/master'