[css-gcpm-4] Incorporate Brad Kemper's copy-into proposal from www-style
merge