update 12-20
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	sitemap.xml
	support/index.html