Merge pull request #58 from embray/issue-2749

Test and possible workaround for Astropy #2749
Conflicts:
	CHANGES.rst