Restoring merge
Removed unnecessary TSRMLS from kernel/array
Merge upstream/1.2.0