php5.4以上対応
Merge branch '2.0' into 2.0dev