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