Merge branch 'jl/remote-rm-prune' into maint