I don't know why this was missing and a fix for the modlist display.
Merge branch 'maintenance' into release
Merge branch 'release'