Fix typo in doctest (thought I already had fixed this but maybe it got lost in a merge)
Merge branch 'master' of github.com:astropy/astropy