composer.jsonを更新
Merge remote-tracking branch 'rsky/master'