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