master(12/25)
Merge remote-tracking branch 'origin/masa2' into masa2