Fixed build.... (shouldn't it be zend_output_globals?)
Merge branch 'PHP-5.6'
Use macro
Merge branch 'PHP-5.6'