Remove PHP4 Legacy Code that may cause errors.
Merge branch 'release/2.11'