PHP/5.5.16
Merge branch 'master' into develop