Merge branch 'fg/remote-prune' into next