Fixed bad check in delete of snapshots
Merge branch 'test' into dev
merge.