Merge remote-tracking branch 'origin/saitou' into sakamoto

Conflicts:
	common.php