Merge pull request #878 from iguananaut/issue-878 with manual merge

Conflicts:
	CHANGES.rst

Conflicts:

	astropy/table/table.py
	astropy/units/tests/test_quantity.py