Merge remote-tracking branch 'upstream/master' into README_ja

Conflicts:
	README.md