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