upstream: PHPmyLMB #95065057cd