modules/admin-mini: merge r4865 to admin-mini