Added encoding mapping data for <meta charset> (c.f. HTML revision 8618)
auto-merge staging into master