MDL-31989 Removing php warnings...