Merge remote-tracking branch 'origin/kazuma'
Merge remote-tracking branch 'origin/master' into kazuma