I have taken Gregory's original patches and cleaned them up quite a bit. I have also added a test for some SSO functionality that his tests (and implementation in Mesa) missed: rendezvous by location.