Add sitemap support
Merge remote-tracking branch 'origin/dev' into watabe_working