Add note about PHP 5.3 behaviour and proxies.
Better wording.
Merge pull request #3018 from drak/patch-2

Add note about PHP 5.3 behaviour and proxies.
Fix table name
Merge branch '2.1' into 2.2