Merge pull request #479 from ausbin/feature/swap-shortest-path-swaps

Consider SWAPs in swap-shortest-path
1 job for master in 34 minutes and 55 seconds (queued for 7 seconds)