merge php 13216b761535814f2652251db94d947ad62b632a

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
merge pioto cedb5b661545ddeb0d5d86bbb4f14cb2c93aa354

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>