Fix for the PHP deprecation messages
branch merge