A fix for issue #966

astropy.test('table') finally works with these changes, so I'd like to see if we can finally get this merged into the main repository.