Merged yet another update to the level builder from the dropbox repo.