Synced with v1.8g of multicol package