Please becareful with the tailed space after slash
Merge branch 'master' into bigint-libtommath

Conflicts:
	Zend/zend_operators.c