Rebase with master.
Team section now works.