Ignore php 53
Merge branch 'master' into 2.x