Merge pull request #19776 from demeritcowboy/18830-5.35
authorSeamus Lee <seamuslee001@gmail.com>
Wed, 10 Mar 2021 20:26:02 +0000 (07:26 +1100)
committerGitHub <noreply@github.com>
Wed, 10 Mar 2021 20:26:02 +0000 (07:26 +1100)
dev/core#2137 - Backport of 18830 and its followups to not crash when asset builder can't do its thing


Trivial merge