Merge pull request #2463 from embray/issue-2463

Astropy.io.fits and DS9