Merge branch 'refs/heads/t/min-complete'

diff --cc dss.c
Simple merge

diff --cc dss.ggo
Simple merge

diff --cc snap.c
Simple merge

diff --cc snap.h
Simple merge