Replace php.net urls
Fix typo, add guide, i18n, bug fixes
Merge remote-tracking branch 'origin/3.3/master' into 3.4/develop