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