Whitespace changes to reduce merge conflicts with the assets branch