Make blocks initialize before biomes to allow biome->block dependencies
Merge remote-tracking branch 'origin/master'