Add sitemap
Commit after merge from upstream