Merge branch 'cory' of gitlab.tiker.net:inducer/leap