Merge branch 'master' into svn

Conflicts:
	d2to1/util.py
	setup.cfg

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@23437 fe389314-cf27-0410-b35b-8c050e845b92

Conflicts:

	d2to1/util.py