謎バグを修整（？）
Merge remote-tracking branch 'origin/master' into workspace