Merge branch 'master' into mail_magazine
引数渡し修正
Merge branch 'mail_magazine'