Merge branch 'verbose_tablewrite_exception'

Conflicts:

	astropy/io/registry.py