Synced with mediawiki-dashboard production code