Merge "Updated patch-coverage script to generate correct HTML" into devel/master