Merge branch 'proposed/save-remove-ct-short-options' into merged
Merge branch 'proposed/specify-vfs-root' into merged
Merge branch 'tmp/nbd-server' into merged
Merge branch 'proposed/set-config-packsize-limit' into merged
Merge branch 'proposed/ref-names-with-slashes' into merged

Conflicts:
	Makefile
Merge branch 'proposed/index-excludes' into merged

Conflicts:
	Makefile