Merge change I44bbc36d into eclair-mr2

* changes:
  Add htm and html extensions to the map as "text/html"