Invited user bugfix rebase to develop

Hey Jon, I thought you might not have the latest develop changes - so I did a rebase - not sure it had the effect I intended - feels like there are more commits in here than I would expect - take a look ...