Merge change 11106

* changes:
  Calculate specular lighting correctly