Merge branch 'feature-throwerror'

Conflicts:
	src/php_error.php
Merge branch 'feature-display'

Conflicts:
	src/php_error.php
Merge branch 'feature-global'
Merge branch 'feature-output'

Conflicts:
	src/php_error.php
Merge branch 'feature-cli'

Conflicts:
	src/php_error.php
Merge branch 'feature-output'
Merge branch 'feature-cli'
merge fixes