Remove E_STRICT from php error reporting in php5.4
Merge commit 'c73601d88b7b7308c7b2e0dc990ec663a9785bc6' into dev