Fixed merge issues with astropy/master