Merge branch 'php5.3' into localwork
Merge branch 'unused-functions' into localwork