big blue join button
Merge pull request #685 from jay-hodgson/release-21

big blue join button
simplify and fix bug around requesting
Merge branch 'release-21' into develop
Merge pull request #693 from jay-hodgson/develop

merge down from release-21 to develop