Merge branch 'conflicting'

# Conflicts:
#	src/plumbing-renamed/main.rs
