Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	_posts/en/0200-12-24-papers.md
	_posts/en/0200-12-27-josm-plugins.md