follow up to #53b294df, fix for info page
Merge branch 'master' into integration