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