Fix TSRM (after afc1debb)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'