Merge pull request #685 from jay-hodgson/release-21

big blue join button
simplify and fix bug around requesting