Rebase with master and burning building fix

You're going to need to overwrite your branch with this pull request. It's a complete rebase with master to make everything up to date and solves all of the merge conflicts.