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