Merge branch 'side'
Japanesize foo
Merge branch 'master' into tmp

Conflicts:
	foo