Better recoverability for non-UserCodeProblem errors during world generation.
Merge branch 'master' into production