Done https://github.com/astropy/astropy/pull/1044