Incorporated Chris Smith's fix for pages with multiple content blocks. Should be a transparent upgrade.