update sitemap, fix #995
Merge branch 'master' into testing