remove the -dev suffix from the Zend version
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove the -dev suffix from the Zend version

Conflicts:
	Zend/zend.h