Team stuff. Looks like it's all working now.
Merge branch 'teams' into dev