DO NOT VERSION YET - Fixes for sitemap + canonical URL problem.  Work still in progress.