Merge change 22710 into eclair

* changes:
  Calculate specular lighting correctly