fixed PHP5.4 E_STRICT error
Merge branch 'php54' into 2.0