deprecated に対応。
Merge branch 'master' into mac