php 5.3
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/files/kit.php.txt
	docs/phpdoc-cache-24/phpdoc-cache-file_de3e03c904d40a8b6ac1c6565e431066.dat
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/files/kit.php.txt
	docs/phpdoc-cache-24/phpdoc-cache-file_de3e03c904d40a8b6ac1c6565e431066.dat