Don't duplicate TSRMLS_CC
Merge branch 'hotfix/tsrmls_cc'
Merge upstream back to master.