Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue
Fixed incorrect argument number
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed incorrect argument number

Conflicts:
	Zend/zend_compile.c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed incorrect argument number
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed incorrect argument number