am cdbf0efc: (-s ours) am 970c74ac: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE

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