Merge commit 'ea9ca9ad' into future

Conflicts:
	+dj/Table.m
Merge branch 'future' into debug_issue2

Conflicts:
	+dj/Table.m