merge in local change that removes PHP notice from log files.