am cedcdc98: (-s ours) am d3ea7331: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE

* commit 'cedcdc984cf36d3b3aeca359b4866e5680427c51':