in Dijkstra, store new cost instead of old
Merge branch 'bug-fix'.  Fix Dijkstra