Merge branch 'stable-2.8'

* stable-2.8:
  Bind content type text/x-h to text/x-c++hdr

Change-Id: I7e0c45111ff7a4f8b3648318e95f74264518863c