Merge "Always have ./clean.sh run ./unstack.sh"