Who page updates
Merge branch 'join'