Marge v2.0.0-beta2
Merge of v2.0.0-beta2
Fixed PHP notice