Testing reverse merge of ghpages into master. Master into ghpages successful.