Xcode 6.0.1 対応
Merge remote-tracking branch 'origin/master'