Merge "Bind content type text/x-h to text/x-c++hdr" into stable-2.8