am 970c74ac: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE

* commit '970c74acb16529b73c03d93469472c3c3ba6af35':
  Use ' for apostrophe in HTML encoding DO NOT MERGE