Merge branch 'k-shortest-path'