Deprecate World, transition to Wilderness
Merge remote-tracking branch 'origin/master'