A few misc tweaks for the new desert level options.
Merge branch 'master' into production