coy's test

coy's test
Merge branch 'coy'

* coy:
  coy's test

Conflicts:
	bin/python/base/deleteNS.py