Merge change 26549 into eclair

* changes:
  Add Website.TYPE information.