Cherry-pick PR #395 onto wip/coord-ci#3

mpickering wants to merge 1 commit intowip/coord-cimpickering/shortest-path:wip/coord-cifrom

wip/coord-ci-pr-395mpickering/shortest-path:wip/coord-ci-pr-395Copy head branch name to clipboard