Merge branch 'hotfix/inspection_methods'
Don't duplicate TSRMLS_CC
Merge branch 'hotfix/tsrmls_cc' into develop